<<<<<<< HEAD
#ifndef MYOBJECT_H
#define MYOBJECT_H

#include <QObject>
#include <QPropertyAnimation>
#include <QPoint>
#include <QPixmap>
#include <QPainter>
class MyObject : public QObject
{
    Q_OBJECT
    Q_PROPERTY(QPoint currentPos READ getCurrentPos WRITE setCurrentPos)
public:
    MyObject(QPoint startpos,QPoint targetPos,QString fileName);
    void draw(QPainter*painter);
    void move();
    QPoint getCurrentPos();
    void setCurrentPos(QPoint pos);
private:
    QPoint startPos;
    QPoint targetPos;
    QPoint currentPos;
    QPixmap pixmap;

signals:

};

#endif // MYOBJECT_H
=======
#ifndef MYOBJECT_H
#define MYOBJECT_H

#include <QObject>
#include <QPropertyAnimation>
#include <QPoint>
#include <QPixmap>
#include <QPainter>
class MyObject : public QObject
{
    Q_OBJECT
    Q_PROPERTY(QPoint currentPos READ getCurrentPos WRITE setCurrentPos)
public:
    MyObject(QPoint startpos,QPoint targetPos,QString fileName);
    void draw(QPainter*painter);
    void move();
    QPoint getCurrentPos();
    void setCurrentPos(QPoint pos);
private:
    QPoint startPos;
    QPoint targetPos;
    QPoint currentPos;
    QPixmap pixmap;

signals:

};

#endif // MYOBJECT_H
>>>>>>> 199f3fb0e9bc83f97607ce663cfb658435caaa4f
